Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 18 Nov 2011 18:30:43 +0000 (10:30 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 18 Nov 2011 18:30:43 +0000 (10:30 -0800)

Trivial merge